* x-win.el: Since we require faces.el, there's no point in setting

	frame-creation-function to x-create-frame - just set it directly
	to x-create-frame-with-faces.

	* x-win.el: (require 'faces), too.  Move (require 'select) to top,
	with the other requires.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 66aeef9de0ac88f9f5ecd080a65d4bcd30dfaf25..38498eaef4b28520f2371373d866c8f8aada878c 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -70,6 +70,8 @@
 (require 'frame)
 (require 'mouse)
 (require 'scroll-bar)
+(require 'faces)
+(require 'select)
 
 (setq command-switch-alist
       (append '(("-bw" .       x-handle-numeric-switch)
@@ -503,14 +505,12 @@ This returns ARGS with the arguments that have been processed removed."
 (x-open-connection (or x-display-name
                       (setq x-display-name (getenv "DISPLAY"))))
 
-(setq frame-creation-function 'x-create-frame)
+(setq frame-creation-function 'x-create-frame-with-faces)
 
 (defun x-win-suspend-error ()
   (error "Suspending an emacs running under X makes no sense"))
 (add-hook 'suspend-hook 'x-win-suspend-error)
 
-(require 'select)
-
 ;;; Arrange for the kill and yank functions to set and check the clipboard.
 (setq interprogram-cut-function 'x-select-text)
 (setq interprogram-paste-function 'x-cut-buffer-or-selection-value)